kallithea Changeset - aaa2478f9d60

Changeset - aaa2478f9d60

Parent rev.

Child rev.

[Not reviewed]

default

0 19 0

Søren Løvborg - 10 years ago 2015-08-14 17:07:49
sorenl@unity3d.com

spelling: don't abbreviate "repository"

19 files changed with 64 insertions and 64 deletions:

kallithea/controllers/admin/repos.py

kallithea/i18n/be/LC_MESSAGES/kallithea.po

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

kallithea/i18n/de/LC_MESSAGES/kallithea.po

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

kallithea/i18n/kallithea.pot

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

kallithea/templates/admin/settings/settings_visual.html

kallithea/templates/changelog/changelog.html

kallithea/templates/changelog/changelog_summary_data.html

kallithea/tests/functional/test_admin_repos.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -502,25 +502,25 @@ class ReposController(BaseRepoController @@
     def edit_advanced_fork(self, repo_name):
         """
         Mark given repository as a fork of another
         :param repo_name:
         """
         try:
             fork_id = request.POST.get('id_fork_of')
             repo = ScmModel().mark_as_fork(repo_name, fork_id,
                                            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())
             h.flash(str(e), category='error')
         except Exception as e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during this operation'),
                     category='error')
         return redirect(url('edit_repo_advanced', repo_name=repo_name))
     @HasRepoPermissionAllDecorator('repository.admin')

kallithea/i18n/be/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -806,25 +806,25 @@ msgid "An error occurred during setting @@
 msgstr "Адбылася памылка пры ўсталёўцы рэпазітара ў агульнадаступны часопіс"
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr "Несупадзенне токенаў"
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr "Адбылася памылка пры выкананні аперацыі"
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr "Зачынены рэпазітар"
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4072,29 +4072,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 msgid "Show public/private icons next to repository names."
 msgstr "Паказваць абразкі публічных рэпазітароў."
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr "Метатэгіраванне"
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
@@ @@ -4651,25 +4651,25 @@ msgstr "Ачысціць выбар" @@
 #: kallithea/templates/changelog/changelog.html:55
 msgid "Go to tip of repository"
 msgstr "Перайсці на верхавіну рэпазітара"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 msgid "Branch filter:"
 msgstr "Адфільтраваць галінку:"
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""
 "Changeset status: %s\n"

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -799,25 +799,25 @@ msgid "An error occurred during setting @@
 msgstr ""
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4023,29 +4023,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 msgid "Show public/private icons next to repository names."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
@@ @@ -4602,25 +4602,25 @@ msgstr "" @@
 #, fuzzy
 msgid "Go to tip of repository"
 msgstr "Prázdný repozitář"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 msgid "Branch filter:"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""
 "Changeset status: %s\n"

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -816,25 +816,25 @@ msgstr "" @@
 "Repositorys im Öffentlichen Logbuch auf"
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr "Schlüssel  stimmt nicht überein"
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr "Während dieser operation trat ein Fehler auf"
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr "Gesperrtes Repositorium"
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4105,29 +4105,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 msgid "Show public/private icons next to repository names."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
@@ @@ -4681,25 +4681,25 @@ msgstr "" @@
 #: kallithea/templates/changelog/changelog.html:55
 msgid "Go to tip of repository"
 msgstr "Gehe zum Tip des Repositorys"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 msgid "Branch filter:"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""
 "Changeset status: %s\n"

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -827,25 +827,25 @@ msgstr "" @@
 " dépôt"
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr "Jeton d’authentification incorrect"
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr "Une erreur est survenue durant cette opération"
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr "Dépôt verrouillé"
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4148,29 +4148,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 #, fuzzy
 msgid "Show public/private icons next to repository names."
 msgstr "Afficher l’icône de dépôt public sur les dépôts"
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr "Meta-tagging"
 #: kallithea/templates/admin/settings/settings_visual.html:97
@@ @@ -4743,25 +4743,25 @@ msgstr "" @@
 #, fuzzy
 msgid "Go to tip of repository"
 msgstr "Veuillez confirmer le verrouillage de ce dépôt"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 #, fuzzy
 msgid "Branch filter:"
 msgstr "filtre"
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -798,25 +798,25 @@ msgid "An error occurred during setting @@
 msgstr ""
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4002,29 +4002,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 msgid "Show public/private icons next to repository names."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
@@ @@ -4578,25 +4578,25 @@ msgstr "" @@
 #: kallithea/templates/changelog/changelog.html:55
 msgid "Go to tip of repository"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 msgid "Branch filter:"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""
 "Changeset status: %s\n"

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -810,25 +810,25 @@ msgid "An error occurred during setting @@
 msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr "トークンが一致しません"
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr "操作中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr "リポジトリをロックしました"
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4113,29 +4113,29 @@ msgstr "管理ページの項目" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数"
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 #, fuzzy
 msgid "Show public/private icons next to repository names."
 msgstr "リポジトリ名の横に公開/非公開アイコンを表示します。"
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr "メタタグ"
 #: kallithea/templates/admin/settings/settings_visual.html:97
@@ @@ -4715,25 +4715,25 @@ msgstr "選択を解除" @@
 #, fuzzy
 msgid "Go to tip of repository"
 msgstr "このリポジトリをロックしますか？"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 #, fuzzy
 msgid "Branch filter:"
 msgstr "フィルタ"
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""

kallithea/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -813,25 +813,25 @@ msgid "Updated repository visibility in @@
 msgstr ""
 #: kallithea/controllers/admin/repos.py:526
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:543
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:568
 msgid "Locked repository"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:571
 msgid "Unlocked repository"
@@ @@ -3991,29 +3991,29 @@ msgstr "" @@
 msgid "Admin pages items"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid "Number of items displayed in the admin pages grids before pagination is shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 msgid "Show public/private icons next to repository names."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
@@ @@ -4561,25 +4561,25 @@ msgstr "" @@
 #: kallithea/templates/changelog/changelog.html:55
 msgid "Go to tip of repository"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 msgid "Branch filter:"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""
 "Changeset status: %s\n"
@@ @@ -4674,25 +4674,25 @@ msgstr "" @@
 #: kallithea/templates/changelog/changelog_summary_data.html:81
 msgid "Add or upload files directly via Kallithea"
 msgstr ""
 #: kallithea/templates/changelog/changelog_summary_data.html:84
 #: kallithea/templates/files/files_add.html:21
 #: kallithea/templates/files/files_ypjax.html:9
 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
 msgid "Existing repository?"
 msgstr ""
 #: kallithea/templates/changeset/changeset.html:8
 #, python-format
 msgid "%s Changeset"
 msgstr ""
 #: kallithea/templates/changeset/changeset.html:36

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -801,25 +801,25 @@ msgid "An error occurred during setting @@
 msgstr ""
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4007,29 +4007,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 msgid "Show public/private icons next to repository names."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
@@ @@ -4586,25 +4586,25 @@ msgstr "" @@
 #: kallithea/templates/changelog/changelog.html:55
 msgid "Go to tip of repository"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 msgid "Branch filter:"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""
 "Changeset status: %s\n"

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -813,25 +813,25 @@ msgid "An error occurred during setting @@
 msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym"
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr "Niezgodność tokenu"
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr "Wystąpił błąd podczas tej operacji"
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr "Zablokowane repozytorium"
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4128,29 +4128,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 #, fuzzy
 msgid "Show public/private icons next to repository names."
 msgstr "Pokazuj w publicznym repo ikonę w repozytoriach"
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr "Tagowanie meta"
 #: kallithea/templates/admin/settings/settings_visual.html:97
@@ @@ -4734,25 +4734,25 @@ msgstr "Wyczyść zaznaczenie" @@
 #, fuzzy
 msgid "Go to tip of repository"
 msgstr "Potwierdź blokowanie repozytorium"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 #, fuzzy
 msgid "Branch filter:"
 msgstr "filtr"
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -811,25 +811,25 @@ msgid "An error occurred during setting @@
 msgstr "Ocorreu um erro ao ajustar esse repositório no diário público"
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr "Descompasso de Token"
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr "Ocorreu um erro durante essa operação"
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4118,29 +4118,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 #, fuzzy
 msgid "Show public/private icons next to repository names."
 msgstr "Mostrar ícone de repositório público nos repositórios"
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr "Meta-Tagging"
 #: kallithea/templates/admin/settings/settings_visual.html:97
@@ @@ -4723,25 +4723,25 @@ msgstr "Deselecionar seleção" @@
 #, fuzzy
 msgid "Go to tip of repository"
 msgstr "Confirme para travar repositório"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 #, fuzzy
 msgid "Branch filter:"
 msgstr "filtro"
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -818,25 +818,25 @@ msgid "An error occurred during setting @@
 msgstr "Произошла ошибка при установке репозитария в общедоступный журнал"
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr "Несовпадение токенов"
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr "Произошла ошибка при выполнении операции"
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr "Закрытый репозиторий"
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4084,29 +4084,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 msgid "Show public/private icons next to repository names."
 msgstr "Показывать иконки публичных репозиториев."
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr "Метатегирование"
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
@@ @@ -4663,25 +4663,25 @@ msgstr "Очистить выбор" @@
 #: kallithea/templates/changelog/changelog.html:55
 msgid "Go to tip of repository"
 msgstr "Перейти на верхушку репозитория"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 msgid "Branch filter:"
 msgstr "Отфильтровать ветку:"
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""
 "Changeset status: %s\n"

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -798,25 +798,25 @@ msgid "An error occurred during setting @@
 msgstr ""
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4014,29 +4014,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 msgid "Show public/private icons next to repository names."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
@@ @@ -4593,25 +4593,25 @@ msgstr "" @@
 #, fuzzy
 msgid "Go to tip of repository"
 msgstr "Prázdny repozitár"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 msgid "Branch filter:"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""
 "Changeset status: %s\n"

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -807,25 +807,25 @@ msgid "An error occurred during setting @@
 msgstr "设置版本库到公共日志时发生错误"
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr "令牌不匹配"
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr "在搜索操作中发生错误"
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4052,29 +4052,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 #, fuzzy
 msgid "Show public/private icons next to repository names."
 msgstr "显示公共版本库图标"
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr "元标记"
 #: kallithea/templates/admin/settings/settings_visual.html:97
@@ @@ -4644,25 +4644,25 @@ msgstr "清除选择" @@
 #, fuzzy
 msgid "Go to tip of repository"
 msgstr "确认锁定版本库"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 #, fuzzy
 msgid "Branch filter:"
 msgstr "过滤"
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -799,25 +799,25 @@ msgid "An error occurred during setting @@
 msgstr ""
 #: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340
 msgid "Token mismatch"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:550
 msgid "Nothing"
 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
 msgid "An error occurred during this operation"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:578
 msgid "Unlocked repository"
@@ @@ -4031,29 +4031,29 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:75
 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
 msgid "Show public/private icons next to repository names."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:92
 msgid "Meta-Tagging"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
@@ @@ -4613,25 +4613,25 @@ msgstr "" @@
 #, fuzzy
 msgid "Go to tip of repository"
 msgstr "Git 版本庫"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 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
 #: kallithea/templates/files/files.html:29
 msgid "Branch filter:"
 msgstr ""
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
 #, python-format
 msgid ""
 "Changeset status: %s\n"

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -68,29 +68,29 @@ ${h.form(url('admin_settings_visual'), m @@
                     ${h.text('admin_grid_items',size=5)}
                     <span class="help-block">${_('Number of items displayed in the admin pages grids before pagination is shown.')}</span>
                 </div>
             </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('Icons')}:</label>
                 </div>
                 <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>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('Meta-Tagging')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('stylify_metatags','True')}

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -50,25 +50,25 @@ ${self.repo_context_bar('changelog', c.f @@
                         <div style="float: right; margin: 0px 0px 0px 4px">
                             <a href="#" class="btn btn-small" id="rev_range_container" style="display:none"></a>
                             <a href="#" class="btn btn-small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                             %if c.revision:
                                 <a class="btn btn-small" href="${h.url('changelog_home', repo_name=c.repo_name)}">
                                     ${_('Go to tip of repository')}
                                 </a>
                             %endif
                             %if c.db_repo.fork:
                                 <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>
                             ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}
                         </div>
                     </div>
                 </div>
                 <div id="changelog" style="clear:both">
                 <div id="graph_nodes">
                     <canvas id="graph_canvas" style="width:0"></canvas>

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -78,25 +78,25 @@ ${c.repo_changesets.pager('$link_previou @@
 %else:
 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
 <h4>${_('Add or upload files directly via Kallithea')}</h4>
 <div style="margin: 20px 30px;">
   <div id="add_node_id" class="add_node">
       <a class="btn btn-mini" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a>
   </div>
 </div>
 %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
     ${c.db_repo_scm_instance.alias} commit -m "Initial" # commit with message
     ${c.db_repo_scm_instance.alias} push ${'origin master' if h.is_git(c.db_repo_scm_instance) else ''} # push changes back
 </pre>
 <h4>${_('Existing repository?')}</h4>
 <pre>
 %if h.is_git(c.db_repo_scm_instance):
     git remote add origin ${c.clone_repo_url}
     git push -u origin master

kallithea/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -530,25 +530,25 @@ class _BaseTest(object): @@
     def test_set_fork_of_other_repo(self):
         self.log_user()
         other_repo = 'other_%s' % self.REPO_TYPE
         fixture.create_repo(other_repo, repo_type=self.REPO_TYPE)
         repo = Repository.get_by_repo_name(self.REPO)
         repo2 = Repository.get_by_repo_name(other_repo)
         response = self.app.put(url('edit_repo_advanced_fork', repo_name=self.REPO),
                                 params=dict(id_fork_of=repo2.repo_id, _authentication_token=self.authentication_token()))
         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()
         # check if given repo is selected
         opt = """<option value="%s" selected="selected">%s</option>""" % (
                     repo2.repo_id, repo2.repo_name)
         response.mustcontain(opt)
         fixture.destroy_repo(other_repo, forks='detach')
     def test_set_fork_of_other_type_repo(self):
@@ @@ -561,25 +561,25 @@ class _BaseTest(object): @@
         repo2 = Repository.get_by_repo_name(self.OTHER_TYPE_REPO)
         self.checkSessionFlash(response,
             'Cannot set repository as fork of repository with other type')
     def test_set_fork_of_none(self):
         self.log_user()
         ## mark it as None
         response = self.app.put(url('edit_repo_advanced_fork', repo_name=self.REPO),
                                 params=dict(id_fork_of=None, _authentication_token=self.authentication_token()))
         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
     def test_set_fork_of_same_repo(self):
         self.log_user()
         repo = Repository.get_by_repo_name(self.REPO)
         response = self.app.put(url('edit_repo_advanced_fork', repo_name=self.REPO),
                                 params=dict(id_fork_of=repo.repo_id, _authentication_token=self.authentication_token()))
         self.checkSessionFlash(response,
                                'An error occurred during this operation')
     def test_create_on_top_level_without_permissions(self):

0 comments (0 inline, 0 general)