Mercurial > kallithea
changeset 5405:aaa2478f9d60
spelling: don't abbreviate "repository"
line wrap: on
line diff
--- a/kallithea/controllers/admin/repos.py Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/controllers/admin/repos.py Fri Aug 14 17:07:49 2015 +0200 @@ -511,7 +511,7 @@ self.authuser.username) fork = repo.fork.repo_name if repo.fork else _('Nothing') Session().commit() - h.flash(_('Marked repo %s as fork of %s') % (repo_name, fork), + h.flash(_('Marked repository %s as fork of %s') % (repo_name, fork), category='success') except RepositoryError as e: log.error(traceback.format_exc())
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -815,7 +815,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "Рэпазітар %s адзначаны як форк %s" #: kallithea/controllers/admin/repos.py:559 @@ -4081,11 +4081,11 @@ msgstr "Абразкі" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "Паказваць абразкі публічных рэпазітароў" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "Паказваць абразкі прыватных рэпазітароў" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4660,7 +4660,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "Параўнаць форк з бацькоўскім рэпазітаром (%s)" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -808,7 +808,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "" #: kallithea/controllers/admin/repos.py:559 @@ -4032,11 +4032,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4611,7 +4611,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -825,7 +825,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "Markiere Repository %s als Abzweig von Repository %s" #: kallithea/controllers/admin/repos.py:559 @@ -4114,11 +4114,11 @@ msgstr "Icons" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4690,7 +4690,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -836,7 +836,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" #: kallithea/controllers/admin/repos.py:559 @@ -4157,11 +4157,11 @@ msgstr "Icônes" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "Afficher l’icône de dépôt public sur les dépôts" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "Afficher l’icône de dépôt privé sur les dépôts" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4752,7 +4752,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -807,7 +807,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "" #: kallithea/controllers/admin/repos.py:559 @@ -4011,11 +4011,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4587,7 +4587,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -819,7 +819,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "%s リポジトリを %s のフォークとする" #: kallithea/controllers/admin/repos.py:559 @@ -4122,11 +4122,11 @@ msgstr "アイコン" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "公開リポジトリのアイコンを表示する" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "非公開リポジトリのアイコンを表示する" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4724,7 +4724,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, fuzzy, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "フォーク元(%s)とフォークを比較" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/kallithea.pot Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/kallithea.pot Fri Aug 14 17:07:49 2015 +0200 @@ -822,7 +822,7 @@ #: kallithea/controllers/admin/repos.py:545 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "" #: kallithea/controllers/admin/repos.py:552 @@ -4000,11 +4000,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4570,7 +4570,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "" #: kallithea/templates/changelog/changelog.html:66 @@ -4683,7 +4683,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:90 -msgid "Push new repo" +msgid "Push new repository" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:98
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -810,7 +810,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "" #: kallithea/controllers/admin/repos.py:559 @@ -4016,11 +4016,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4595,7 +4595,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -822,7 +822,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" #: kallithea/controllers/admin/repos.py:559 @@ -4137,11 +4137,11 @@ msgstr "Ikony" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4743,7 +4743,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, fuzzy, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "porównaj gałęzie %s" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -820,7 +820,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" #: kallithea/controllers/admin/repos.py:559 @@ -4127,11 +4127,11 @@ msgstr "Ícones" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "Mostrar ícone de repositório público nos repositórios" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "Mostrar ícone de repositório privado nos repositórios" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4732,7 +4732,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, fuzzy, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "Comparar bifurcação com %s" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -827,7 +827,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "Репозиторий %s отмечен как форк %s" #: kallithea/controllers/admin/repos.py:559 @@ -4093,11 +4093,11 @@ msgstr "Иконки" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "Показывать иконки публичных репозиториев" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "Показывать иконки приватных репозиториев" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4672,7 +4672,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "Сравнить форк с родительским репозиторием (%s)" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -807,7 +807,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "" #: kallithea/controllers/admin/repos.py:559 @@ -4023,11 +4023,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4602,7 +4602,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -816,7 +816,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" #: kallithea/controllers/admin/repos.py:559 @@ -4061,11 +4061,11 @@ msgstr "图标" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "显示公共版本库图标" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "显示私有版本库图标" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4653,7 +4653,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Fri Aug 14 17:07:49 2015 +0200 @@ -808,7 +808,7 @@ #: kallithea/controllers/admin/repos.py:552 #, python-format -msgid "Marked repo %s as fork of %s" +msgid "Marked repository %s as fork of %s" msgstr "" #: kallithea/controllers/admin/repos.py:559 @@ -4040,11 +4040,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:80 -msgid "Show public repo icon on repositories" +msgid "Show public repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repo icon on repositories" +msgid "Show private repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:86 @@ -4622,7 +4622,7 @@ #: kallithea/templates/changelog/changelog.html:62 #, python-format -msgid "Compare fork with parent repo (%s)" +msgid "Compare fork with parent repository (%s)" msgstr "" #: kallithea/templates/changelog/changelog.html:66
--- a/kallithea/templates/admin/settings/settings_visual.html Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/templates/admin/settings/settings_visual.html Fri Aug 14 17:07:49 2015 +0200 @@ -77,11 +77,11 @@ <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('show_public_icon','True')} - <label for="show_public_icon">${_('Show public repo icon on repositories')}</label> + <label for="show_public_icon">${_('Show public repository icon on repositories')}</label> </div> <div class="checkbox"> ${h.checkbox('show_private_icon','True')} - <label for="show_private_icon">${_('Show private repo icon on repositories')}</label> + <label for="show_private_icon">${_('Show private repository icon on repositories')}</label> </div> <span class="help-block">${_('Show public/private icons next to repository names.')}</span> </div>
--- a/kallithea/templates/changelog/changelog.html Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/templates/changelog/changelog.html Fri Aug 14 17:07:49 2015 +0200 @@ -59,7 +59,7 @@ <a id="compare_fork" title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}" - class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a> + class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a> %endif ## text and href of open_new_pr is controlled from javascript <a id="open_new_pr" class="btn btn-small"></a>
--- a/kallithea/templates/changelog/changelog_summary_data.html Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Fri Aug 14 17:07:49 2015 +0200 @@ -87,7 +87,7 @@ %endif -<h4>${_('Push new repo')}</h4> +<h4>${_('Push new repository')}</h4> <pre> ${c.db_repo_scm_instance.alias} clone ${c.clone_repo_url} ${c.db_repo_scm_instance.alias} add README # add first file
--- a/kallithea/tests/functional/test_admin_repos.py Fri Aug 14 16:11:48 2015 +0200 +++ b/kallithea/tests/functional/test_admin_repos.py Fri Aug 14 17:07:49 2015 +0200 @@ -539,7 +539,7 @@ repo = Repository.get_by_repo_name(self.REPO) repo2 = Repository.get_by_repo_name(other_repo) self.checkSessionFlash(response, - 'Marked repo %s as fork of %s' % (repo.repo_name, repo2.repo_name)) + 'Marked repository %s as fork of %s' % (repo.repo_name, repo2.repo_name)) assert repo.fork == repo2 response = response.follow() @@ -570,7 +570,7 @@ repo = Repository.get_by_repo_name(self.REPO) repo2 = Repository.get_by_repo_name(self.OTHER_TYPE_REPO) self.checkSessionFlash(response, - 'Marked repo %s as fork of %s' + 'Marked repository %s as fork of %s' % (repo.repo_name, "Nothing")) assert repo.fork is None