Changeset - aaa2478f9d60
kallithea/controllers/admin/repos.py
Show inline comments
 
@@ -508,13 +508,13 @@ class ReposController(BaseRepoController
 
        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())
kallithea/i18n/be/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -812,13 +812,13 @@ 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 "Адбылася памылка пры выкананні аперацыі"
 

	
 
@@ -4078,17 +4078,17 @@ 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 "Паказваць абразкі публічных рэпазітароў."
 

	
 
@@ -4657,13 +4657,13 @@ msgstr "Перайсці на верхавіну рэпазітара"
 
#, 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/i18n/cs/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -805,13 +805,13 @@ 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 ""
 

	
 
@@ -4029,17 +4029,17 @@ 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 ""
 

	
 
@@ -4608,13 +4608,13 @@ msgstr "Prázdný repozitář"
 
#, 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/i18n/de/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -822,13 +822,13 @@ 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"
 

	
 
@@ -4111,17 +4111,17 @@ 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 ""
 

	
 
@@ -4687,13 +4687,13 @@ msgstr "Gehe zum Tip des Repositorys"
 
#, 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/i18n/fr/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -833,13 +833,13 @@ 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"
 

	
 
@@ -4154,17 +4154,17 @@ 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"
 
@@ -4749,13 +4749,13 @@ msgstr "Veuillez confirmer le verrouillage de ce dépôt"
 
#, 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:"
kallithea/i18n/hu/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -804,13 +804,13 @@ 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 ""
 

	
 
@@ -4008,17 +4008,17 @@ 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 ""
 

	
 
@@ -4584,13 +4584,13 @@ msgstr ""
 
#, 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/i18n/ja/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -816,13 +816,13 @@ 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 "操作中にエラーが発生しました"
 

	
 
@@ -4119,17 +4119,17 @@ 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 "リポジトリ名の横に公開/非公開アイコンを表示します。"
 
@@ -4721,13 +4721,13 @@ msgstr "このリポジトリをロックしますか?"
 
#, 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:"
kallithea/i18n/kallithea.pot
Show inline comments
 
@@ -819,13 +819,13 @@ 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 ""
 

	
 
@@ -3997,17 +3997,17 @@ 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 ""
 

	
 
@@ -4567,13 +4567,13 @@ msgstr ""
 
#, 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 ""
 
@@ -4680,13 +4680,13 @@ msgstr ""
 
#: 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/i18n/nl_BE/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -807,13 +807,13 @@ 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 ""
 

	
 
@@ -4013,17 +4013,17 @@ 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 ""
 

	
 
@@ -4592,13 +4592,13 @@ msgstr ""
 
#, 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/i18n/pl/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -819,13 +819,13 @@ 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"
 

	
 
@@ -4134,17 +4134,17 @@ 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"
 
@@ -4740,13 +4740,13 @@ msgstr "Potwierdź blokowanie repozytorium"
 
#, 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:"
kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -817,13 +817,13 @@ 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"
 

	
 
@@ -4124,17 +4124,17 @@ 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"
 
@@ -4729,13 +4729,13 @@ msgstr "Confirme para travar repositório"
 
#, 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:"
kallithea/i18n/ru/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -824,13 +824,13 @@ 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 "Произошла ошибка при выполнении операции"
 

	
 
@@ -4090,17 +4090,17 @@ 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 "Показывать иконки публичных репозиториев."
 

	
 
@@ -4669,13 +4669,13 @@ msgstr "Перейти на верхушку репозитория"
 
#, 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/i18n/sk/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -804,13 +804,13 @@ 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 ""
 

	
 
@@ -4020,17 +4020,17 @@ 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 ""
 

	
 
@@ -4599,13 +4599,13 @@ msgstr "Prázdny repozitár"
 
#, 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/i18n/zh_CN/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -813,13 +813,13 @@ 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 "在搜索操作中发生错误"
 

	
 
@@ -4058,17 +4058,17 @@ 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 "显示公共版本库图标"
 
@@ -4650,13 +4650,13 @@ msgstr "确认锁定版本库"
 
#, 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:"
kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -805,13 +805,13 @@ 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 ""
 

	
 
@@ -4037,17 +4037,17 @@ 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 ""
 

	
 
@@ -4619,13 +4619,13 @@ msgstr "Git 版本庫"
 
#, 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/admin/settings/settings_visual.html
Show inline comments
 
@@ -74,17 +74,17 @@ ${h.form(url('admin_settings_visual'), m
 
                <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">
kallithea/templates/changelog/changelog.html
Show inline comments
 
@@ -56,13 +56,13 @@ ${self.repo_context_bar('changelog', c.f
 
                                </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>
kallithea/templates/changelog/changelog_summary_data.html
Show inline comments
 
@@ -84,13 +84,13 @@ ${c.repo_changesets.pager('$link_previou
 
      <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>
kallithea/tests/functional/test_admin_repos.py
Show inline comments
 
@@ -536,13 +536,13 @@ class _BaseTest(object):
 
        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>""" % (
 
@@ -567,13 +567,13 @@ class _BaseTest(object):
 
        ## 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)
0 comments (0 inline, 0 general)