diff --git a/kallithea/controllers/admin/repos.py b/kallithea/controllers/admin/repos.py --- a/kallithea/controllers/admin/repos.py +++ b/kallithea/controllers/admin/repos.py @@ -511,7 +511,7 @@ class ReposController(BaseRepoController 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()) diff --git a/kallithea/i18n/be/LC_MESSAGES/kallithea.po b/kallithea/i18n/be/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po @@ -815,7 +815,7 @@ msgstr "Нічога" #: 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 @@ msgid "Icons" 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 @@ msgstr "Параўнаць fork з %s" #: 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 diff --git a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po @@ -808,7 +808,7 @@ msgstr "Nic" #: 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 @@ msgid "Icons" 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 @@ msgstr "" #: 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 diff --git a/kallithea/i18n/de/LC_MESSAGES/kallithea.po b/kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po @@ -825,7 +825,7 @@ msgstr "Nichts" #: 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 @@ msgid "Icons" 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 @@ msgstr "" #: 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 diff --git a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po @@ -836,7 +836,7 @@ msgstr "[Aucun dépôt]" #: 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 @@ msgid "Icons" 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 @@ msgstr "" #: 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 diff --git a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po @@ -807,7 +807,7 @@ msgstr "" #: 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 @@ msgid "Icons" 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 @@ msgstr "" #: 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 diff --git a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po @@ -819,7 +819,7 @@ msgstr "ありません" #: 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 @@ msgid "Icons" 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 @@ msgstr "%s とフォークを比較" #: 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 diff --git a/kallithea/i18n/kallithea.pot b/kallithea/i18n/kallithea.pot --- a/kallithea/i18n/kallithea.pot +++ b/kallithea/i18n/kallithea.pot @@ -822,7 +822,7 @@ msgstr "" #: 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 @@ msgid "Icons" 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 @@ msgstr "" #: 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 @@ msgid "Add New File" 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 diff --git a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po @@ -810,7 +810,7 @@ msgstr "" #: 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 @@ msgid "Icons" 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 @@ msgstr "" #: 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 diff --git a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po @@ -822,7 +822,7 @@ msgstr "Brak" #: 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 @@ msgid "Icons" 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 @@ msgstr "porównaj gałęzie %s" #: 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 diff --git a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po @@ -820,7 +820,7 @@ msgstr "Nada" #: 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 @@ msgid "Icons" 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 @@ msgstr "Comparar bifurcação com %s" #: 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 diff --git a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po @@ -827,7 +827,7 @@ msgstr "Ничего" #: 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 @@ msgid "Icons" 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 @@ msgstr "Сравнить fork с %s" #: 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 diff --git a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po @@ -807,7 +807,7 @@ msgstr "Nič" #: 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 @@ msgid "Icons" 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 @@ msgstr "" #: 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 diff --git a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po @@ -816,7 +816,7 @@ msgstr "无" #: 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 @@ msgid "Icons" 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 @@ msgstr "" #: 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 diff --git a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po @@ -808,7 +808,7 @@ msgstr "" #: 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 @@ msgid "Icons" 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 @@ msgstr "" #: 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 diff --git a/kallithea/templates/admin/settings/settings_visual.html b/kallithea/templates/admin/settings/settings_visual.html --- a/kallithea/templates/admin/settings/settings_visual.html +++ b/kallithea/templates/admin/settings/settings_visual.html @@ -77,11 +77,11 @@ ${h.form(url('admin_settings_visual'), m
${h.checkbox('show_public_icon','True')} - +
${h.checkbox('show_private_icon','True')} - +
${_('Show public/private icons next to repository names.')}
diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html --- a/kallithea/templates/changelog/changelog.html +++ b/kallithea/templates/changelog/changelog.html @@ -59,7 +59,7 @@ ${self.repo_context_bar('changelog', c.f ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)} + class="btn btn-small"> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)} %endif ## text and href of open_new_pr is controlled from javascript diff --git a/kallithea/templates/changelog/changelog_summary_data.html b/kallithea/templates/changelog/changelog_summary_data.html --- a/kallithea/templates/changelog/changelog_summary_data.html +++ b/kallithea/templates/changelog/changelog_summary_data.html @@ -87,7 +87,7 @@ ${c.repo_changesets.pager('$link_previou %endif -

${_('Push new repo')}

+

${_('Push new repository')}

     ${c.db_repo_scm_instance.alias} clone ${c.clone_repo_url}
     ${c.db_repo_scm_instance.alias} add README # add first file
diff --git a/kallithea/tests/functional/test_admin_repos.py b/kallithea/tests/functional/test_admin_repos.py
--- a/kallithea/tests/functional/test_admin_repos.py
+++ b/kallithea/tests/functional/test_admin_repos.py
@@ -539,7 +539,7 @@ class _BaseTest(object):
         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 @@ class _BaseTest(object):
         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